Merge from upstream.
authorEli Zaretskii <eliz@gnu.org>
Sat, 2 Jan 2010 10:22:05 +0000 (05:22 -0500)
committerEli Zaretskii <eliz@gnu.org>
Sat, 2 Jan 2010 10:22:05 +0000 (05:22 -0500)
commita9b50d572b802a4a50bb34cbbd40c4a507cf9655
tree80c15ec3c4ebf91acfa52cbab7318fe738343a88
parent01cb25b77901b1579def349e7346253b03dd0080
parent8774c1c751348958c666bec92bc2d4679e7cf97b
Merge from upstream.